gpsbabelfe_do-not-check-for-newer-version

Disable check for newer versions on start.

Gbp-Pq: Name gpsbabelfe_do-not-check-for-newer-version

diff --git a/gui/babeldata.h b/gui/babeldata.h
index efe8003f8b200ef420be45e857517a7032600dd3..7c78ac5e9f9f9b50e9cf4a51255583d930358305 100644 (file)
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -150,7 +150,7 @@ public:
   int runCount_{0};
 
   // Global preferences.
-  bool startupVersionCheck_{true};
+  bool startupVersionCheck_{false};
   bool reportStatistics_{false};
   bool allowBetaUpgrades_{false};
   bool ignoreVersionMismatch_{true};

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index e0c9ac43e29a9d56508bb78cf27f0019b47106e8..ae5e266ea74aa0e986358d8603cec240aa75320e 100644 (file)
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -170,7 +170,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   connect(ui_.actionAbout, &QAction::triggered, this, &MainWindow::aboutActionX);
   connect(ui_.actionVisit_Website, &QAction::triggered, this, &MainWindow::visitWebsiteActionX);
   connect(ui_.actionMake_a_Donation, &QAction::triggered, this, &MainWindow::donateActionX);
-  connect(ui_.actionUpgradeCheck, &QAction::triggered, this, &MainWindow::upgradeCheckActionX);
   connect(ui_.actionPreferences, &QAction::triggered, this, &MainWindow::preferencesActionX);
 
   connect(ui_.inputFormatCombo, &QComboBox::currentIndexChanged,
@@ -223,17 +222,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   restoreSettings();
 
   upgrade = new UpgradeCheck(this, formatList_, babelData_);
-  if (babelData_.startupVersionCheck_) {
-    upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
-                             allowBetaUpgrades());
-  }
-
-  if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
-    VersionMismatch vm(nullptr, babelVersion_, QString(VERSION));
-
-    vm.exec();
-    babelData_.ignoreVersionMismatch_ = vm.neverAgain();
-  }
 }
 
 void MainWindow::switchTranslator(QTranslator& translator, const QString& filename)
@@ -1000,10 +988,6 @@ void MainWindow::applyActionX()
 //------------------------------------------------------------------------
 void MainWindow::closeActionX()
 {
-  QDateTime wt= upgrade->getUpgradeWarningTime();
-  if (wt.isValid()) {
-    babelData_.upgradeCheckTime_ = wt;
-  }
   babelData_.runCount_++;
 
   QDateTime now = QDateTime::currentDateTime();

diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
index f5765e104d997973a3bc802596e66d3a2b249593..4533f23457dc2abd51b897509f9a5b216e738b5b 100644 (file)
--- a/gui/mainwinui.ui
+++ b/gui/mainwinui.ui
@@ -691,7 +691,6 @@
     <addaction name="actionHelp"/>
     <addaction name="separator"/>
     <addaction name="actionAbout"/>
-    <addaction name="actionUpgradeCheck"/>
     <addaction name="separator"/>
     <addaction name="actionVisit_Website"/>
     <addaction name="actionMake_a_Donation"/>
@@ -720,11 +719,6 @@
     <string>Preferences...</string>
    </property>
   </action>
-  <action name="actionUpgradeCheck">
-   <property name="text">
-    <string>Check for Upgrade</string>
-   </property>
-  </action>
   <action name="actionVisit_Website">
    <property name="text">
     <string>Visit Website...</string>

diff --git a/gui/preferences.cc b/gui/preferences.cc
index f12978f1f42c4b0f7f9a7dbe9a3ddd24a47bace4..f998cd7299577f072af0533b1d99aee5cfcdcbe4 100644 (file)
--- a/gui/preferences.cc
+++ b/gui/preferences.cc
@@ -47,7 +47,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
 {
   ui_.setupUi(this);
 
-  ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
   ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
 
   connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked);
@@ -86,7 +85,6 @@ void Preferences::acceptClicked()
     formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
   }
 
-  babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
   babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
   accept();
 }

diff --git a/gui/preferences.ui b/gui/preferences.ui
index ac671d7d9357d98d07ac68eb8e680f0aab570bda..d0b1f72dde7bd90caa1507841d07d1c52d5090a3 100644 (file)
--- a/gui/preferences.ui
+++ b/gui/preferences.ui
@@ -39,13 +39,6 @@
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
-        <item>
-         <widget class="QCheckBox" name="startupCheck">
-          <property name="text">
-           <string>Check for newer version on start.</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QCheckBox" name="reportStatisticsCheck">
           <property name="text">